messed with applicaton layout
Merge remote-tracking branch 'boilerplate/master'