Renaming, cleaning up code
Merge
Merge origin/master

Conflicts:
	src/main/java/com/mycompany/bachelorprosjekt2014/controller/database/executions/DBHandler.java
	src/main/webapp/Resources/js/admin.js
	src/main/webapp/Resources/mysql/dbsetup.sql