initial merchant app rewritten with codeigniter framework
Merge remote-tracking branch 'origin/master'