Are now able to add favorites
Merging issues
Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav

Conflicts:
	api/index.php