--
-
Merge remote-tracking branch 'original/master'

Conflicts:
	ProjectFiles/mensaunibe/src/com/ese2013/mensaunibe/FragmentNotifications.java
na
Merge remote-tracking branch 'original/master'
Merge remote-tracking branch 'original/master'
Merge remote-tracking branch 'original/master'
implemented database, should already save all data.
TODO: load data from database (if no connenction is available) by using load() from the databasemanager
Merge pull request #72 from theodortruffer/master

DataBase implemented