pulled and maunally mereged
Merge pull request #38 from smonette/pages_still

pulled and maunally mereged, more pages and users functionality.