add .idea folder to the ignore list
Merge branch 'master' of https://github.com/dashanlu/studio and remove some unnecessary files

Conflicts:
	.gitignore