Added .idea/ to gitignore and changed branching system
Merge branch 'develop'