Updated to Angular JS
Added JS Unit Testing
Merge remote-tracking branch 'origin/mvc'

Conflicts:
	.idea/workspace.xml
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/pids/server.pid