Fixed bug
Merge branch 'summer14' of https://github.com/shalinshah1993/DNACloud into summer14