Post merge commit

View controller added
1) iPhone 4 designs are still needed
2)small design issues are still needed to be fixed