Merge remote-tracking branches 'origin/master' and 'upstream/master'
SIMS-883: Removing floating nav from rubric form view, by hiding it
SIMS-883: Adding some styling to the rubric form view, putting margin-top so that it doesn't hug the top.
Placing inserts of User and UserProfile into a transaction closer
Merge pull request #291 from kcole-avataracademic/130909_SIMS883

SIMS 883
Merge pull request #292 from kcole-avataracademic/130909_SIMS893

SIMS 893 - userimport transaction
adding optimized js 09-09-2013 11:35:17
Setting the observer and observee finalization dates to current time when observation is finalized.
Update ObservationViews.js

Removing console log
adding optimized js 09-09-2013 15:02:35
SIMS-908: fixed created by user bug caused by last weeks model changes
Merge branch 'master' of https://github.com/editure/sims
Straightening filter logic. The filter function needs to be rewritten
to use collection filters instead of hiding elements with jquery.

	modified:   public/app/modules/Home/HomeView.js
	modified:   public/app/templates/Home/Filter.tpl
Fixed click binding on site to ignore mailto: links
Merge pull request #294 from rayeckel/master

Hotfix: SIMS-908 fixed created by user bug on plan caused by last weeks model changes
Merge pull request #293 from kcole-avataracademic/130909_SIMS892

SIMS 892
Merge pull request #295 from theD1360/master

Straightening filter logic. The filter function needs to be rewritten
adding optimized js 09-09-2013 17:10:12
Merge branch '130909_SIMS846', remote-tracking branch 'upstream/master' into 130909_SIMS846
SIMS-905 front end recognizes 0 as kindergarten