Latest commit 2d5581e Oct 11, 2014 Chris Mospaw change substr to substring
Conflicts:
	assets/admin.js