final bug fix
final bug fix
try
Merge branch 'development' into devByColin
added 'contact us'
Merge branch 'devByColin' into development
merge from dev to master