Merge remote-tracking branch 'danielamitay/master'

Conflicts:
	DACircularProgress/DACircularProgressView.m