gem init
Merge branch 'develop'

Conflicts:
	app/models/exakat_clip/asset.rb
	app/models/exakat_clip/asset/audio.rb
	app/models/exakat_clip/asset/image.rb
Merge branch 'release/1.0.0'
Merge branch 'release/1.0.1'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update version
Merge branch 'hotfix/1.0.3' into develop