aabla
Merge branch 'release' of github.com:lubosch/tabber

Conflicts:
	app/assets/stylesheets/fonts.css.scss
Merge branch 'release' of github.com:lubosch/tabber
sdas
Merge branch 'release' of github.com:lubosch/tabber
kok
Merge branch 'release' of github.com:lubosch/tabber
Merge branch 'release' of github.com:lubosch/tabber
abl
Msdadas
asdasd
asdasdaerge branch 'release' of github.com:lubosch/tabber

Conflicts:
	app/controllers/activities_controller.rb
da
ko
Msdasd

merge branch 'release' of github.com:lubosch/tabber

Conflicts:
	app/assets/javascripts/application.js
	public/assets/application-abf0940005279103944cc24eb867c88f.css.gz
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/manifest.yml
Merge branch 'release' of github.com:lubosch/tabber
ok
Merge branch 'release' of github.com:lubosch/tabber
ok
Merge branch 'release' of github.com:lubosch/tabber
gems