Fix xls export responses controler
Remove more cruft from xls xml template
Remove spreadsheet dependency (still indirectly required by roo though), cleanup requires, update dependecies
Fix rubyzip dependecy
Fix bundle
Disable linktracking in piwik
Added class to main menu helper ul tag, to enable css scoping based on class not id
Merge branch 'master' into jquery

Conflicts:
	Gemfile.lock