reorganized settings page - settings on left, conflicts on right
Merge branch 'master' of https://github.com/vickygx/theFrozzies
Merge branch 'master' of https://github.com/vickygx/theFrozzies
Merge branch 'master' of https://github.com/vickygx/theFrozzies
new backend for parse_models according to queue discussion
Merge branch 'master' of https://github.com/vickygx/theFrozzies