input action
Merge branch 'master' of github.com:Calixte/dezrann

Conflicts:
	src/main/webapp/watch.jsp