saving current work
Merge branch 'feature' of https://github.com/ten24/Slatwall into
feature-4-dynamicjs

Conflicts:
	api/views/meta/getcompressedjs.cfm
Merge branch 'feature' of https://github.com/ten24/Slatwall into
feature-4-dynamicjs

Conflicts:
	api/views/meta/getcompressedjs.cfm
resolving conflict
fix for keywords when searching a transient collection
removing test code
buttoning up rbkey implementation
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
adding rbkey, property hint,property,title,fieldtype getters in metadata
property of objects
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
creating generic method of init
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs
updating how property display and formfields work with new javascript
API
saving current work
Merge branch 'feature' of https://github.com/ten24/Slatwall into
feature-4-dynamicjs

Conflicts:
	admin/layouts/default.cfm
	api/views/meta/getcompressedjs.cfm
saving current work
Merge branch 'feature' of https://github.com/ten24/Slatwall into
feature-4-dynamicjs

Conflicts:
	admin/client/js/slatwalladmin.js
	admin/layouts/default.cfm
	api/views/js/ngslatwall.cfm