Merge branch 'master' of github.com:Hamdan85/carisaac into theme

Conflicts:
	app/assets/javascripts/js.js
landing style
Merge branch 'refs/heads/theme'
scheme to install foundation with the theme
foundation working properly