Fix margin set by browser default
Add .idea to ignore list
Merge branch 'develop' into bxSlider

Conflicts:
	.gitignore