Initial commit. Files added.

merge dev to master