Merge branch 'master' of https://github.com/vidii/Dazul

Conflicts:
Dazul/.DS_Store
Dazul/Dazul/en.lproj/MainStoryboard_iPad.storyboard
Merge branch 'master' of https://github.com/vidii/Dazul

Conflicts:
	Dazul/.DS_Store
	Dazul/Dazul/en.lproj/MainStoryboard_iPad.storyboard
uu

uuu