Bootstrap compatible
thin
Assets.debug turned off
Fixed a lot of bugs
Finalized changes
merge conflict fix