Updated Bootstrap to version 3.0.
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/resources/build/styles/base.css
	src/main/webapp/resources/build/styles/bootstrap/bootstrap.css
	src/main/webapp/resources/build/styles/main.css
	src/main/webapp/resources/build/styles/main.less
	src/main/webapp/resources/themes/default/styles/theme.css
LESS configuration changes.
Track root LESS files only.
Merge branch 'master' into Bootstrap3
Bootstrap 2 image removal.
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/resources/build/styles/base.css
	src/main/webapp/resources/build/styles/bootstrap/bootstrap.css
	src/main/webapp/resources/build/styles/main.css
	src/main/webapp/resources/build/styles/main.less
	src/main/webapp/resources/themes/default/styles/theme.css
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/resources/themes/default/styles/theme.css
Merge branch 'master' into Bootstrap3
Updated LESS configuration to match master.
Merge remote-tracking branch 'origin/Bootstrap3' into Bootstrap3

Conflicts:
	src/main/webapp/resources/build/styles/main.css
	src/main/webapp/resources/build/styles/main.less
Updated LESS import order.
Added Bootstrap LESS overrides.
Bootstrap 3 configuration.
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/resources/build/styles/base.less
	src/main/webapp/resources/build/styles/main.css
	src/main/webapp/resources/themes/default/styles/theme.css
	src/main/webapp/resources/themes/default/styles/theme.less
Bootstrap 3 configuration.
Bootstrap 3 configuration.
Login page styling.
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/WEB-INF/views/registration.jsp
	src/main/webapp/resources/build/styles/bootstrap/variables.less
	src/main/webapp/resources/build/styles/main.css
	src/main/webapp/resources/build/styles/mixins/preboot.less
	src/main/webapp/resources/themes/default/styles/theme.css
	src/main/webapp/resources/themes/default/styles/theme.less
Merge remote-tracking branch 'origin/Bootstrap3' into Bootstrap3

Conflicts:
	src/main/webapp/WEB-INF/views/login.jsp
	src/main/webapp/resources/build/styles/base.less
IntelliJ configuration. Added jQuery migrate. Updated Modernizr and requireJS.
IntelliJ configuration. Added jQuery migrate. Updated Modernizr and requireJS.
Merge remote-tracking branch 'origin/Bootstrap3' into Bootstrap3

Conflicts:
	.idea/jsLibraryMappings.xml