arip commit
arip commit
Merge origin/master
arip commit
Merge origin/master

Conflicts:
	www/js/controllers.js
arip commit
arif commit