New UI merge in progress

This commit is contained in:
Unknwon 2014-07-26 00:24:27 -04:00
commit 8dd07c0ddd
199 changed files with 15030 additions and 9325 deletions