api changes
Merge https://github.com/wtodom/ANRTM
Merge https://github.com/wtodom/ANRTM

Conflicts:
	app/app.js