Add /idea to ignore file.
add branch dev-master
Merge remote-tracking branch 'origin/master' into dev-master

Conflicts:
	.gitignore