CLC-3410 Move UserApi into app/models/user
CLC-3410 Put UserApi in User:: module
CLC-3410 Rename UserApi->Api
Merge pull request #2271 from ctweney/clc-3410-13

CLC-3410 Thirteenth batch of reorg: UserApi
CLC-3363 Borders for all input elements are now box-shaped, and have 1px grey border. Focusing on inputs transitions border color from a lighter to darker grey
Merge pull request #2272 from NolanChan/CLC-3363

CLC-3363 Input Border Changes
CLC-3461 - My Academics is not showing/hiding correctly
https://jira.ets.berkeley.edu/jira/browse/CLC-3461

**Note** Review carefully
Merge pull request #2273 from christianv/CLC-3461

CLC-3461 - My Academics is not showing/hiding correctly
CLC-3465 Make inclusion of next year in FinAid configurable, and disabled by default

Conflicts:
	app/models/my_activities/my_fin_aid.rb
	spec/models/my_activities/my_fin_aid_spec.rb
CLC-3465 Master branch fix - Make inclusion of next year in FinAid configurable, and disabled by default
Merge pull request #2274 from ctweney/clc-3465-master

CLC-3465 Remove the 2014 - 2015 data from the CalCentral Fin Aid API
CLC-3472: Add jscs - JavaScript Style Checker
https://jira.ets.berkeley.edu/jira/browse/CLC-3472
CLC-3275 Add original_user_id to MyActivities and MyGroups
(CLC-3301) Changed Current Activities Right Margin
https://jira.ets.berkeley.edu/jira/browse/CLC-3301
CLC-3452 Improve error message from textbooks when a future term isn't found
CLC-3470 Stop Research Hub from killing MyGroups
Merge pull request #2276 from christianv/CLC-3472

CLC-3472: Add jscs - JavaScript Style Checker
Merge pull request #2279 from ericayin/CLC-3301

(CLC-3301) Changed Current Activities Right Margin
Merge pull request #2278 from ctweney/clc-3275

CLC-3275 Add original_user_id to MyActivities and MyGroups
NOJIRA - Update README

Couple of fixes:

* Make the Java 7 requirement more explicit. 2 students have tripped over this
* Use the right name for ojdbc6.jar
* Leave a note that mentions that they don't really have to do the steps after the development steps. The students have install memcached / torquebox when they don't really have to.