table is done?
Merge branch 'master' of https://github.com/kshamiev/test

Conflicts:
	www/view/Include/Header.html