Merge branch 'release/victor_fixes' into develop
Merge branch 'hotfix/about_title' into develop
Merge branch 'hotfix/fix_footer_link' into develop
Move to Middleman
Update Readme
Add Tweet references, disable Smusher

Conflicts:
	source/javascripts/main.coffee
Update readme
Merge branch 'release/1.1'

Conflicts:
	application/assets/javascripts/main.coffee
	application/core.rb
	application/views/_faq.slim
	application/views/_footer.slim
	application/views/docs/API, SDK/widgets.md
	application/views/docs/gamification/games_reference.md
	application/views/docs/objects.md
	application/views/docs/widgets/about_widgets.md
	application/views/footer_links/_about.slim
	application/views/footer_links/_docs.slim
	application/views/footer_links/_features.slim
	application/views/footer_links/_preview.slim
	application/views/footer_links/_signup.slim
	application/views/index.slim
	application/views/layout.slim
	application/views/mail/reg_complete.slim
	config/settings.yml
	source/about/index.slim
	source/features/index.slim
	source/partials/_nav.slim
	vendor/assets/javascripts/vendor.js
Update beta release text
Update year