Signed-off-by: lokesh <yokesh.ganesan@gmail.com>
Merge branch 'master' of https://github.com/yokesh28/arya.git

Conflicts:
	protected/modules/front/views/site/about.php
Merge branch 'master' of https://github.com/yokesh28/arya.git

Conflicts:
	protected/modules/front/views/site/about.php