push notifications working on android
added comment
Merge branch 'dev' of https://github.com/oceans15/teleport into android-notifications

Conflicts:
	www/js/controllers.js
fixed conflicts
commented out notification code to fix issues in dev
Merge pull request #41 from oceans15/android-notifications

Android notifications