Blog Display and JS Fix

Fixes to the dynamic generation of javascript and added a display to the
blog
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/Main.php