Server now serves JSON instead of rendered templates. Pair programmed with Mathias Eurich.
Merge master into ViewNote.
cleaned up UI a little
started integrating our app with angularjs, pair programmed with Harrison Mulder
Fixed broken login link and redirect properly (I think).
Obtained code for master, working on sep. branch
Tests for routes without having an access token. Pair programmed with Tony Young.
Added UIWebView (embedded web browser) in app
Pair programmed with Graeme
Merge branch 'master_viewnote' into viewnote
Fixed a typo.
AngularJS trimming/maintenance

- Removed unused/unnecessary files.
- Removed unused column in Notes table.
- Changed loggedIn flag to object in attempts to make ng-show work (in
progress)
- Added a method to change the loggedIn flag when the user clicks log
in/out (in progress - not working)
- Removed unused methods from mainController.js.
- Moved the tinymce script to index.html in attempt to make the text
editor work again (in progress - not working).
Added splash page (I think that's what we can call it)
Added server connectivity (only with localhost)
-just have to change the address it calls from
 localhost:5000/lists to <ip_addr>:5000/lists
 on master
Merge branch 'viewnote' into master_viewnote
-iOS items
Made iOS app only read, added html reader which writes to temporary.html then reads the file into the text view. Contributors: Graeme Peters, Lyndon Quigley
removed loggedIn check and mainWelcome-partial from mainApp-partial
- integrated existing functionality into AngularJS app
- changed client-side validation of note title
- pair programmed with Harrison Mulder
Merged branch 'master' into master_viewnote

Conflicts:
	_Note iOS App/_Note.xcodeproj/project.xcworkspace/xcuserdata/duongnguyen.xcuserdatad/UserInterfaceState.xcuserstate
	_Note iOS App/_Note.xcodeproj/xcuserdata/duongnguyen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	_Note iOS App/_Note/AppDelegate.m
	_Note iOS App/_Note/Base.lproj/Main.storyboard
	_Note iOS App/_Note/NoteEditorViewController.m
	server/server_tests.py