NOJIRA Change icons
Merge branch 'master' of github.com:collectiveaccess/providence
PROV-808 UI redo
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	themes/default/css/base.css