dashboard foundation edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/views/default/js/scripts.js
	web/views/default/templates/index.tpl.php
suploAJAX