redesigned lots a things
Merge branch 'master' of https://github.com/gilbertodemelo/dalis

Conflicts:
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	js/bootstrap.js
	js/bootstrap.min.js