airvantage restservice inital commit

Conflicts:
	webapp/app/js/app.js
	webapp/app/js/controllers.js