Merges the 2.0v updated to Bootstrap 3

Also adds Google Builder, but is not implemented for build of styles yet