WIP
Add travis badge
adjusted margins
Merge remote-tracking branch 'origin/master'
update visual style
Merge branch 'master' into 1025945

Conflicts:
	bower.json
	script.js
Working dragger