Design Upgrade
Merge branch 'master' of https://github.com/jsaadein/angularJS

Conflicts:
	tpl/ui_widgets.html
Delete