Signed-off-by: DS <DS@ds-9571ec2d157d>
Merge branch 'master' of https://github.com/yokesh28/arya.git

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

Signed-off-by: DS <DS@ds-9571ec2d157d>