Conflicts:
	.gitmodules
#59 remove unnecessary fileds, add styles
Merge branch '59_task' into testing

Conflicts:
	.gitmodules