Target latest 3.1.2-SNAPSHOT
Update the admin Javascript files to include the admin subpath

(cherry picked from commit f11720942c55c59c8bba449f857ecaef03b4d44a)
Fixes #101 - remove extraneous closed div
Fixes #101 - remove extraneous closed div

(cherry picked from commit dcce60e0a3fb4327cc4a8fc608a619261a995da2)
Reverts #101 - Extraneous </div> was not a problem, but fixed html formatting and a div that ended in /> to avoid further confusion
Reverts #101 - Extraneous </div> was not a problem, but fixed html formatting and a div that ended in /> to avoid further confusion

(cherry picked from commit 4dc336f4b942a3a5c93dee3479a9d329e07614c5)
Added commented out properties for convenience.
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/819(cherry
picked from commit ab8c8474223b4595a329ef66d5c17e360b4e7c4f)

Conflicts:

	site/src/main/resources/runtime-properties/common.properties
Fixed misplaced comments in XML.(cherry picked from commit
10d8a96073e1e14e51fb78e97b1d8174ffabb192)

Conflicts:

	site/src/main/webapp/WEB-INF/applicationContext.xml
Updating demo site to align with changes for
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/819(cherry
picked from commit e238dbec18173302795c60b78b05e894d09d46f5)

Conflicts:

	site/src/main/resources/runtime-properties/common.properties
	site/src/main/webapp/WEB-INF/applicationContext.xml
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	site/src/main/webapp/WEB-INF/applicationContext.xml
Fixes BroadleafCommerce/BroadleafCommerce#716 - Remove the one_page_checkout element from displaying in the final HTML markup
Replaces Google CDN with cdnjs
Fixes #111 - Removes unused forgot password vars
Merge pull request #107 from watermelonjuice/patch-2

Replaces Google CDN with cdnjs
@#$% Canada
Removes site/enunciate.xml
Merge pull request #117 from watermelonjuice/enuciate

Removes site/enunciate.xml
Merge pull request #115 from watermelonjuice/canada

@#$% Canada
Merge pull request #112 from watermelonjuice/patch-4

Fixes #111 - Removes unused forgot password vars
Fixes #103 - Remove load_pricesplit_data.sql since it is no longer in the project