Merge origin/master

Conflicts:
	README.md
	public/assets/countdown/flipcountdown-master/img/digit-md.png
	public/assets/countdown/flipcountdown-master/img/digit-sm.png
	public/assets/countdown/flipcountdown-master/img/digit-xs.png
	public/assets/countdown/flipcountdown-master/screen/1.png
	public/assets/countdown/flipcountdown-master/screen/2.png
	public/assets/js/public.js
	public/wbb-projects-public.php
	wbb-projects.php
Merge origin/master