Updated Guideline and Contributing
Merge branch 'master' into develop

* master:
  Updated Guideline and Contributing

Conflicts:
	config.codekit