get rid of unncessary "mainline" stuff
fixed merge conflict in #process_inclusion
css for new home page
improved link handling, allowed more characters
further simplified controller id handling based on new name handling
got file/image bootstrapping working
Merge branch 'newhome' into bootstrapfiles
consolidated / simplified styling for new home page / sidebar
updated built-in layouts to match new default (card) layout
added html5shiv (and cleaned up *head)
Merge branch 'newhome' into develop
regenerated fixtures and fixed tests to match
wiped old assets away
re-precompiled assets
wiped old assets away
re-precompiled assets
made html5shiv precompile (and ticked up version)
added base support for common html views
fixed pack_file task
minor optimization of #all_roles