Merge pull request #44 from ShadowSam/master

Refactoring so that functions javascript functions created for subscript...
AllowedAccessUsers should always exist as a field
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev

Conflicts:
	app/models/Entity.java
Merge pull request #46 from ShadowSam/master

You need to pull this commit. It is a refactor of current code with a ch...
Merge remote-tracking branch 'upstream/dev'
blah blah project file
Merge remote-tracking branch 'upstream/dev'
Removing project