templates modified
merged from master
rai logo added
templated modified