Added idea files.
More editing
Merge branch 'development'