gitignore .idea
Merge branch 'develop'

Conflicts:
	.gitignore
Merge branch 'develop'
delete unused test fixtures
add resource/module qunit test files
Merge branch 'develop'
version 0.1.4
Merge branch 'master' into develop