last js/html changes
Merge branch 'master' of github.com:kshmir/ss-2013

Conflicts:
	app/domain/simulator/strategy/load_balancer.rb