Done changes to database
Merge branch 'master' of https://github.com/Grollo/RobotStudioNLP.git

Conflicts:
	languageServlet/src/se/lth/cs/main/Submitter.java