replaced &'s with &amp;
replaced &'s with &amp;
Merge branch 'dev'