Add latest GruntFile.js from https://git.kineo.com/adapt/grunt-build-process
Add grunt_config.json
Merge branch 'hotfix/gruntProcess'

Conflicts:
	Gruntfile.js
	grunt_config.json
Amend GruntFile.js

Remove watch warning for now
Merge branch 'develop' of github.com:cgkineo/adapt_framework
Merge branch 'develop' of github.com:cgkineo/adapt_framework
Point to local wiki
Merge branch 'develop' of github.com:cgkineo/adapt_framework
add bookmarking data
Merge branch 'develop' of github.com:cgkineo/adapt_framework
Merge branch 'develop' of github.com:cgkineo/adapt_framework
Add latest Gruntfile.js from adapt-grunt
Update package.json
restructure _interactionsComplete implementation
add has children check to methods. removed methods from componentModel.js
remove trailing ,
Merge branch 'features/interactionsComplete-rewrite' of github.com:cgkineo/adapt_framework into develop