#gitignore
Merge branch 'dev-master' into controlling

Conflicts:
	.gitignore
Merge branch 'dev-master' into controlling

Conflicts:
	.gitignore
delete from submodule
Merge branch 'dev-master' into oper
Merge branch 'oper' of github.com:itdoors/sd into oper
Merge branch 'oper' of github.com:itdoors/sd into oper
Merge branch 'oper' of github.com:itdoors/sd into oper
Merge branch 'oper' of github.com:itdoors/sd into oper
fix session get value