Commit 776d93d64dad007f91d5e0d39e4e90b38dbab9c7

Tree SHA1: f31119c
Parent SHA1: 0b82c34 (Merge branch 'dev' of git.pantoto.org:mouchak/mouchak into dev)
Parent SHA1: 2998a3d (Bug fixes:)

Merge branch 'development' of git.pantoto.org:mouchak/mouchak into dev

Resolve Conflicts:
	.gitignore