Merge branch 'master' of https://github.com/techlogics/InTheFuture_android

Conflicts:
	.gitignore