Add Save and Delete Button to the Detail View
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ch/m335/controllers/DetailActivity.java
	src/ch/m335/controllers/MainActivity.java
Add a back method for the Save and Delete Button
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ch/m335/controllers/DetailActivity.java