aa
Merge branch 'master' of github.com:haipn/nereha

Conflicts:
	src/com/androidhive/pushnotifications/MainActivity.java