changed email confirmation email, added stuff for felix, changed some search and order tests
merged with master
altered design
Merge branch 'master' into develop
finished all the new info boxes
Merge branch 'develop'
merged with master