jaria
popup
Merge branch 'master' of https://github.com/jparia/webmob

Conflicts:
	www/jaria.html
	www/jss/jaria.js
version 20131126
maj