Merge remote-tracking branch 'coder4life/master' into k30_bugs4
Move code outside of view
Fix conflicts with lastest changes
Merge pull request #1426 from xillibit/k30_bugs4

K3.0 admin template :Move code outside of view