delete htaccess
- insert evt.preventDefault()
Merge remote-tracking branch 'origin' into develop

Conflicts:
	css/main.css
Merge branch 'develop' of https://github.com/FIC/B-Spline-Interaction into develop
- update eq layout