22:
Merge branch 'master' of https://github.com/Thainq/DDProject
22:
Merge branch 'master' of https://github.com/Thainq/DDProject

Conflicts:
	DDProject/DDProject/Base.lproj/Main_iPhone.storyboard
	DDProject/EditInfoAccountViewController.m
22:45