checkWebPassword mit timestamp
Merge branch 'master' of https://github.com/jochenschwander/SIT

Conflicts:

Server/src/main/java/de/hs_mannheim/sit/ss14/database/MySQLDatabaseConne
ctor.java
db con
merge