Migrated the Project incl. Diary to Touchkit
changed diary editor that the form will persist
push merged files
Merge branch 'master' of
https://github.com/reubd1/ch.bfh.bti7081.s2013.red

Conflicts:
	ch.bfh.red.appl/pom.xml
	ch.bfh.red.appl/src/main/java/ch/bfh/red/app/model/assignment/Assignment.java
	ch.bfh.red.appl/src/main/java/ch/bfh/red/app/view/DiarySummaryView.java
	ch.bfh.red.appl/src/main/java/ch/bfh/red/app/view/RedAppUI.java
	ch.bfh.red.parent-doc/README.md
	ch.bfh.red.parent-doc/teamPolicy/HOWTO_ImportPolicy.png