gemlock
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit

Conflicts:
	views/faq.erb
	views/videos.erb