Merge branch 'release/1.7'
Merge branch 'release/1.8'
Merge branch 'master' of github.com:CodePolaris/eidos
images
logo
controls.png error fix
menu improvement
removing all hrefs
Merge branch 'release/0.1'

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'release/0.2'
Merge branch 'master' into develop