Change to Standard API
Merge branch 'david'
Merge from Master
Fix ActionBar Menu.
removed getUserLocation from NetworkConnectionController and changed
loadFromFile in UserDataController to loadData
no longer trying to put a null extra for calling
CreateComment
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Made CC theoretically take intents, but hasn't been tested yet.
Merge branch 'bradley'
Changed how locationModel is interfaced in CC
Made JUnit tests work for CC, but not with receiving intents.
implemented the passing of the HeadModel to SubCommentViewActivity
Merge branch 'Cole'
Worked on CC Post button code
minor changes
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
changed attemptCommentCreation from private to public
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/HeadModel.java