Merge branch 'term' of github.com:blitzmann/phpredmin into blitzmann-master
Fix styling for hash key edit
Merge branch 'master' of github.com:blitzmann/phpredmin into blitzmann-master
Merge branch 'blitzmann-master'