Updated the code, removed unused files/activities and updated the
mainActivity Layout. Be careful when you merge so you do not add these
files again!
Merge remote-tracking branch 'origin/FixesForOverallFunctions'