temp commit to ensure rollback
Merge branch 'master' of git@github.com:inpho/inphosite

Conflicts:

	inphosite/templates/actb.html
Merge branch 'master' of git@github.com:inpho/inphosite
Merge branch 'master' of git@github.com:inpho/inphosite
Merge branch 'master' of git@github.com:inpho/inphosite
Merge branch 'master' of git@github.com:inpho/inphosite
Merge branch 'master' of git@github.com:inpho/inphosite
verifying this is alefrost/inphosite
a
testing to make sure hook only runs on master
removed TEST
testing last thing
testing more
"copied post-commit hook to repo directory"
Added link to search Philpapers in Thinker interface
Merge branch 'master' of git@github.com:inpho/inphosite
Added data integrity filters to thinker list
moved data integrity for thinkers to separate page in admin section
removed data integrity check from entity.list()
switch thinker data integrity page to use selector instead of accordion divs