Initial merge from Andrew
Added registration module (now working)
Added templates for login + register