updates
small fixes to cj.flash
Merge branch 'master' of https://github.com/jbielick/cakejax

Conflicts:
	cakejax.js