Maven configuration update.
Version ranges added in POM file.
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 Edge

Conflicts:
	src/main/webapp/resources/build/styles/main.css
Maven configuration update.
Version ranges added in POM file.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Bootstrap3

Conflicts:
	src/main/webapp/resources/themes/default/styles/theme.css
Removed .CSS exceptions.
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.
Merge branch 'master' into Edge

Conflicts:
	src/main/webapp/resources/themes/default/styles/theme.css
Added Bootstrap LESS overrides.
Bootstrap 3 configuration.
Merge branch 'Bootstrap3' into Edge

Conflicts:
	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