123
Merge branch 'master' of https://github.com/Pole-he/MyApps

Conflicts:
	MyApps/src/com/nathan/myapps/utils/ApiUtils.java