SQL-setninger
Merge branch 'master' of https://github.com/tiriksan/Smarkosystem

Conflicts:
	Smartkosystem/src/java/spring/ov13/domene/utils/Database.java
Merge branch 'master' of https://github.com/tiriksan/Smarkosystem