update for 1.6.1 :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
update for 1.6.1 :D