Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #93 from matthewrice345/master

Fixed some encoding errors recently introduced.
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from instructure/master

Update 11-6-14
Adds RxJava method for uploading avatar images
Merge pull request #94 from joshuadutton/master

Adds RxJava method for uploading avatar images
Merge remote-tracking branch 'upstream/master'
Adds constant for front page wiki page
Merge pull request #95 from joshuadutton/master

Adds constant for front page wiki page
Merge remote-tracking branch 'upstream/master'
Fixed issue with assignment edits
Merge pull request #96 from Blackchai/master

Fixed issue with editing assignments.