gitignore
update gitignore
Merge branch 'develop'

Conflicts:
	PhotoBox.xcworkspace/xcuserdata/nico.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist