tmp save
Merge branch 'master' into refactor

Conflicts:
	app/assets/javascripts/wireless/simulator.js
refactor move_model.js
Merge branch 'refactor' of https://github.com/siman-man/Simulator into refactor

Conflicts:
	app/assets/javascripts/config/sample.rb
	app/assets/javascripts/wireless/simulator.js
refactor user.js
tmp save