improves performance on the backend side
Merge branch 'master' of github.com:kshmir/ss-2013

Conflicts:
	app/assets/javascripts/anim.js
Merge branch 'master' of github.com:kshmir/ss-2013