Signed-off-by: lokesh
<lokesh@lokesh-HP-Compaq-dc7800-Convertible-Minitower>
Merge branch 'master' of https://github.com/yokesh28/vitas.git

Conflicts:
	version2/protected/views/site/about.php
	version2/protected/views/site/project.php
	version2/themes/vitas/css/style.css