changed function of minify helper to call both css and js. Added minified css in template
version 1.5.4
Merge branch 'rc' into dev

Conflicts:
	VERSION