new contact
Merge branch 'master' of github.com:djheru/marionette

Conflicts:
	assets/js/apps/contacts/new/new_view.js