Start of the stats page
Added some more escaping, and updated some of the formatting.
Correcting mis-updated file here too.
no message
Merge branch 'maker-camp' of https://github.com/Make-Magazine/makeblog into maker-camp
Start of the volume 35 shortcodes.
Revert "Start of the volume 35 shortcodes."

This reverts commit 9a94a174f9a60c47e4b8f6ae3112801fd8a375c4.
Merge branch 'newsletter'
Update RTMFC_NY Entries iFrame
New function that returns the cover image for a given volume number.
Shortcode to return a preview box for a given issue.
Bringing the new buttons into there own file. (they grow up so quick…) and styles for the volume tease.
Merge branch 'shortcodes'

Conflicts:
	includes/shortcodes.php
Update to existing vol promo short code with new url's for maker shed
Merge branch 'bolson'
Merge branch 'master' of https://github.com/Make-Magazine/makeblog
Navigation update to HIW
Merge branch 'bolson'

Conflicts:
	sidebar-hiw-left.php
98% there for the dashboard! Just need to build ajaxy columns.
Cleaning up mag-dashboard. Fixing merge conflict in sidebar-hiw-left.php and making links dynamic.