Added schema structures for default values/functions
Merge branch 'develop' of github.com:3logic/apollo into develop

Conflicts:
	libs/apollo.js
	libs/base_model.js