Settings + Database
Save from a long long work !
A big correction about Git usage + Merging Pierre workwq

Conflicts:
	Mpp_Project/src/dk/aau/mpp_project/database/DatabaseHelper.java
	Mpp_Project/src/dk/aau/mpp_project/fragment/SettingsFragment.java