bower
Merge branch 'master' of github.com:steenk/steenk.github.io

Conflicts:
	demo2.html
	nondep-datepicker.js