Spring datasource
tull
Merge branch 'master' of http://github.com/zalox/SKS-2.0 into Brukere
tull
Fiksa merge konflikt
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
mekket litt i javaklasser
add javabeans
Merge pull request #23 from thomasSve/master

Heisann og hopsann
La til endre passord-metode