jquery ui tabs
Merge branch 'master' of https://github.com/Kaifat/test_est

Conflicts:
	profile.htm
Merge branch 'master' of https://github.com/Kaifat/test_est

Conflicts:
	profile.htm