[➠] Updated “.gitignore”.
[➠] Updated “aloha” to version 0.23.12.
image-url instead of url
raR
webkit fix
tweakaro
remove annoying css error
Merge branch 'master' of github.com:timur/aloha-rails into develop
Merge branch 'master' of github.com:slipstreamstudio/aloha-rails into develop

Conflicts:
	gnuside-aloha-rails.gemspec
Merge branch 'update_aloha' of github.com:mkempe/aloha-rails into develop

Conflicts:
	vendor/assets/javascripts/aloha/css/aloha.css