Merge branch 'master' of github.com:gd452/Android_Project

Conflicts:
	.idea/workspace.xml