Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Update newplan.js and newplan_controller
add action => when "save" button click, save json
Merge branch 'master' into add_save_button_to_newplan

Conflicts:
	app/assets/javascripts/newplan.js
	app/controllers/newplan_controller.rb
Merge branch 'add_save_button_to_newplan'