Removed bad symlink
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge of dev
Gitignore