back to colored layout
Merge remote-tracking branch 'ranaramez/develop'
arabic sample data
using controllers for views