Commit by User 2 in Branch_Develop
Merge branch 'Develop' of https://github.com/NPNGPO/TestProject into Branch_Develop

Conflicts:
	AndroidApplication/src/com/example/AndroidApplication/MyActivity.java
Merge pull request #3 from NPNGPO/Branch_Develop

Commit by User 2 in Branch_Develop