Merge branch 'master' of https://github.com/tttangmi/Mango.git

Conflicts:
	.gitignore