Removed hashnav
changes from code review
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall into feature-bs3-collections
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections
Fixes the return void issue
Updated Version 3.3.016.065
Merge branch 'develop' into feature-bs3-collections
cfset instead of cfreturn
Merge branch 'feature-bs3-collections' of
https://github.com/ten24/Slatwall into feature-bs3-collections

Conflicts:
	admin/layouts/default.cfm
	model/service/UpdateService.cfc
	org/Hibachi/HibachiAssets/js/global.js
reverting conflict commit
adding prototype for collection listing
adding current page and pageshow to the api
Added some style into main.css and made bootstrap3 compatability changes
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections-david