Updated documentation, Moved files where they belonged, deleted, useless templates
Updated Readme file
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md