Spring datasource
tull
Merge branch 'master' of http://github.com/zalox/SKS-2.0 into Brukere
tull
Fiksa merge konflikt
Litt orden
Merge pull request #19 from thomasSve/master

Litt orden
Ny Database metode for query
Add database
Fix merge database
Add JdbcTemplate instead of prepstat
Merge DatabaseConnectior
Merged DatabaseConnector
passordkryptering
Rm datasources and fix stuff in databaseconnector
.gitignore update
Merge branch 'master' of http://github.com/tedjk/SKS-2.0
merged med ted
add javabeans
Heisann og hopsann