--
-
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'
Complete MVC rewrite of app + repo restructuring & cleanup
fix conflicts
Merge remote-tracking branch 'original/master'
fix conflicts again
Merge branch 'master' of https://github.com/exside/ese2013-team5

Conflicts:
	ProjectFiles/dev/mensaunibe/umlmodel.png
	ProjectFiles/dev/mensaunibe/umlmodel.ucls
	ProjectFiles/v1.0/README.md
	Review/ese2013-team8/Software Review Document - Team 8.docx
Hopefully fixed conflicts
Merge pull request #70 from exside/master

Complete MVC rewrite of app + repo restructuring & cleanup
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
Database is working. Also added connection check in TaskCreateModel, so the task loads the model from the database if theres no connection to the internet
Merge pull request #73 from theodortruffer/master

Database is working. Also added connection check in TaskCreateModel, so ...
added favorite feature to mensa model, also saves/loads/removes favorite state from database on clicking the checkbox in the mensalist
Merge pull request #74 from theodortruffer/master

added favorite feature to mensa model, also saves/loads/removes favorite...