User1_Branch
Merge pull request #2 from NPNGPO/Branch_U1

User1_Branch
Merge branch 'Develop' of https://github.com/NPNGPO/TestProject into Branch_Develop

Conflicts:
	AndroidApplication/src/com/example/AndroidApplication/MyActivity.java