reorganized code
fixed ui-router
Merge branch 'landing' into development
fixed and merged landing branch into development