vupttse_update  comment Ads fnc
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
vupttse_update  comment Ads fnc