some new things
esclude idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
delete
gzip and image_tag