misc changes
Merge branch 'master' of https://github.com/dickhardt/A2P3_agent

Conflicts:
	AppiOS/www/js/routers/AppRouter.js