rename via proxy because of git rename problem with lower to upper case conversion
rename part2
Alert commits by Raoul
rename last part
AlertService started
Added time
Sql query implemented
Update alert finished
alerts.jsp started
Alerts finished
Merge remote-tracking branch 'origin/alerts'
alert js part
Merge remote-tracking branch 'origin/flo'

Conflicts:
	Skeleton/src/main/java/ch/studihome/jspserver/model/User.java