Resolve conflicts
Remove coffeescript files
New plan form validations passing
add javascript
Add error handling on plan create page and sample params hash