Removed (?) Ghost
Post en user omgeschreven naar sql queries, check of iemand in database staat. zoja, op activated zetten.
Almost fixed ALL Submit issues
New website layout + login functionality + creating new JSP pages and more
fixing git
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas

Conflicts:
	Code/.gitignore
	Code/pom.xml
	Code/src/main/java/User.java
	Code/src/main/java/formHandlers/Login2.java
	Code/src/main/java/nl/utwente/thinktank/types/User.java
	Code/src/main/java/types/User.java
	Code/src/main/webapp/Checkout.jsp
	Code/src/main/webapp/css/stylesheet.css
	Code/src/main/webapp/index.html
	Code/src/main/webapp/index.jsp
	Code/src/main/webapp/login.jsp
	Code/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	Code/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.thinkthank/ThinkThank/pom.properties
	Code/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.thinkthank/ThinkThank/pom.xml
fixing git
deel URL pakken gefixt
added mail scripts
changing verification
Submit working (categories not yet), spam is being filtered (not 100% correct)
Changed the structure of the newly added posts if a new posts are created and added a profile container in an idea page
Fixing map structure of this branch
Merge branch 'Sophie'

Conflicts:
	Code/src/main/webapp/submit.jsp
Merge branch 'Jeroen'

Conflicts:
	Code/.classpath
	Code/pom.xml
	Code/src/main/java/nl/utwente/thinktank/types/Post.java
merging git
Merge branch 'master' into Joyce

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/A2ZFileReader.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/SpamFilter.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Word.java
	Code/src/main/webapp/submit.jsp