Removing .DS_Store
Merge remote-tracking branch 'origin/master'
resolved auto layout issues in login screen. works in both iOS 6 & 7