editing some classes and views
pull and resolving some conflicts
adding register functionality
Merge branch 'alpha-1' of https://github.com/WayangCMS/WayangCMS into alpha-1
Merge branch 'alpha-1' of https://github.com/WayangCMS/WayangCMS into alpha-1
fix errors in home controller and layout
fix conflict on frontend home controller
Merge branch 'alpha-1' of https://github.com/WayangCMS/WayangCMS into alpha-1
fix admin page controller