#SOCR-49 Fixed
core module
core spec updated
Merge branch 'testfield' of https://github.com/SOCRedu/SOCR-framework into testfield

Conflicts:
	app/scripts/core/core.coffee