Update bolierplate for admin
Fix merge conflicts.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bower.json
Merge remote-tracking branch 'upstream/master'