[MOD] Adapting UX to edit collection and new collection
merge things
Merge remote-tracking branch 'origin/sprint3' into sprint3

Conflicts:
	myHoard/src/main/java/com/myhoard/app/activities/MainActivity.java
	myHoard/src/main/res/values/strings.xml