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 #1 from instructure/master

Update 10-23-14
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from instructure/master

Upate
Add RxJava
Merge pull request #86 from hhoang/master

Added support for gpa_scale grading type
Merge pull request #87 from joshuadutton/master

Add RxJava
Merge remote-tracking branch 'upstream/master'
Updated gradle files to next version of gradle.
Merge pull request #88 from hhoang/master

Added not_graded as a gradingType
Merge pull request #89 from matthewrice345/master

Updated gradle files to next version of gradle.
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from instructure/master

Update 11-5-14
Stop tracking .iml files
Update gradle