Main table sync with database
Merge branch 'master' of https://github.com/ferseroz/RPCWeb

Conflicts:
	index.html