initial  commit of working dev branch 2
Merge branch 'master' into dev2
Merge branch 'dev2' into develop
added .git ignore
added .suo to .gitignore