Merge branch 'PyDev'

Conflicts:
	Python/TTTClick.py
Merge branch 'LuaDev'
Merge branch 'LuaDev'
Merge branch 'LuaDev'
Merge branch 'LuaDev'
Merge branch 'origin/LuaDev'
Added in tests
Merge branch 'master'