multiple fixes
https://app.asana.com/0/5003181567170/5220301392078
fix
showbigimage dialog
https://app.asana.com/0/4694818755431/5221136338250
hotfix
ongoing
Merge branch 'master' into bgfixes
bla bla bla:
bugfixes
Merge branch 'bugfixes' into users
multiple user stuff
bugfixes
Merge branch 'bugfixes' into dev
conflict resolve
Conflicts:
	app/assets/javascripts/main.js
admin page
users admin fixes
https://app.asana.com/0/4694818755431/5005122717837
avatars
remove psych
https://app.asana.com/0/4741299985902/5248564056021
https://app.asana.com/0/4694818755431/5220301392151