Dev1.0
Merge branch 'Dev'

Conflicts:
	readme.txt