Merge pull request #11 from Kjven/master

pull master to calvin
changeset #13 will continute tomorrow
Merge branch 'calvin' of https://github.com/Cyrois/eece310_app
Merge branch 'calvin'
merge request #14
Merge pull request #13 from Kjven/calvin

merge request #14 from calvin
added UseGPS activity
Merge pull request #14 from Kjven/michael

merge request #15, implemented UseGPS activity
added some color, custom colors can be set in colors.xml
Merge pull request #15 from Kjven/calvin

merge request #15: added some color, custom colors can be set in colors.xml
fixed the up button in the action bar
changed button press colour and up action bar
Merge pull request #16 from Kjven/calvin

merge request #16
fixed gps crash
Merge pull request #17 from Kjven/michael

fixed gps crash