Add trash icon to cancel and add style
Updated Version 3.5.002.002
Merge branch 'develop-4' into develop
Updated Version 3.5.002.003
removing baseHREF for testing
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-fix-create-pages
Updated Version 3.5.002.004
Added a reload to ant task
Attempt 2
Attempt 3
Merge pull request #2576 from ten24/feature-fix-create-pages

Feature fix create pages
Closing post
Convert POST back to GET
Points to login page now
Added update warning
Updated Version 3.5.003
Merge branch 'master' into develop

Conflicts:
	admin/views/main/update.cfm
	version.txt
Merge branch 'develop' into feature
Updated the baseHREF to only be set when the browser is ie9. Also added
conditional to set the baseURL to index.cfm/ if there is not a baseURL
otherewise it gets set to the #baseURL#/index.cfm/
Merge branch 'feature' of https://github.com/ten24/Slatwall.git into feature-4-baseHREFfix