fixed - Add asset field not tranceted when displayed
fixed invalid characters input on textfields, it will now notify user that the user inputted invalid characters in the form
fixed the conflicts at views/assets.js
Merge remote-tracking branch 'philip/develop' into develop

* philip/develop:
  fixed the conflicts at views/assets.js
  fixed invalid characters input on textfields, it will now notify user that the user inputted invalid characters in the form
  fixed - Add asset field not tranceted when displayed

Conflicts:
	app/scripts/views/assets.js
re-implemented fix for task 1337