Merging development and master branch and creating a fresh development branch.

[sarmilaupadhyaya]

As I just noticed we have been pushing in different branch. I am using development branch.