not much
Merge branch 'master' of github.com:monepic/dash

Conflicts:
	src/app/gallery/gallery.js
	src/app/gallery/gallery.tpl.html
tables
pagination styling
table highlight, pagination