added icons for textblocks
start jquery conversion
Merge branch 'master' into jquery
version bump
django 1.6 compat, staticfiles is now called static
update for jquery and mootools compat