updates view
Merge remote-tracking branch 'origin/master'

* origin/master:
  updated view and added get_icon_name
  Alliance-Founders can set new Alliance-Description after creation

Conflicts:
	app/views/technologies/index.html.erb
	config/routes.rb