Forked a develop branch
Merge remote-tracking branch 'origin/master' into develop
Added placeholders for new icons
Removed bad commenting
Merge remote-tracking branch 'origin/master' into develop
Added cache-busting
Updated to Django 1.7