fixed e-mail url
Aligned alerts
Users are now added to member_of
Hopefully my last commit message for this project
forgot 1 file to remove
Added categories to posts
Merge branch 'Sophie' into Branch_at_the_end_of_the_universe

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/ExternalRegister.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/UTRegister.java
Merge branch 'Bas' into Branch_at_the_end_of_the_universe

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/types/Post.java
Fixed last small bugs
Merge branch 'master' of https://github.com/utwente-di/di14