- some added resource
Merge branch 'master' of https://github.com/ervanux/doING

Conflicts:
	doING/en.lproj/MainStoryboard.storyboard