Adding File .idea from Webstorm to gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages

Conflicts:
	.idea/workspace.xml
Merge branch 'gh-pages'

Conflicts:
	.idea/workspace.xml