2014-12-29 18:31:30
Merge remote-tracking branch 'origin/master'

Conflicts:
	base.js
	controllers.js