edit css, js for caculator salary
Merge branch 'master' of https://github.com/thanhtuan/TTTN

Conflicts:
	css/contract.css
	protected/controllers/ContractController.php
	protected/views/contract/calculate.php