ensure compass  installed
sass version of usergrid.less
Merge branch 'development' into compass
removed old index.html
removed old and broken app.html
bootstrap.min.js moved under js/lib
removed excessive twitter bootstrap files
removed reset.css in favor of compass/reset helper
removed less.watchr
removed unused stylesheets
code format refactoring
Merge branch 'development' into compass
Merge branch 'development' into compass

Conflicts:
	.puppet/manifests/main.pp
$white var removed. it duplicates bootstrap sass var.
bootstrap var $black replacement for black color
 changes from development branch applied to usergrid.less file before merge
Merge branch 'development' into less-to-sass

Conflicts:
	css/usergrid.css
	css/usergrid.less
puppet module updates
apigee@f9f58de53f5e47efd5358b766f226bb4a9c19a12 and apigee@baa62737837036ba4afef2333ffc6557d4385d3b changes in usergrid.less applied to usergrid.scss
Merge branch 'development' into less-to-sass

Conflicts:
	css/usergrid.css
	css/usergrid.less