Merge branch 'development'

Conflicts:
.idea/misc.xml
.idea/workspace.xml
Change gitignore