Merge branch 'master' of github.com:zarie/apka into volix
row fix
views fix
Merge branch 'volix'