button
Merge branch 'master' of https://github.com/panbasten/DI

Conflicts:
	war/src/main/webapp/resources/libs/button/button.js
di