Fixed solution so that it builds

Resolved conflicts. Removed reference to SharedAssemblyInfo.cs in the
Kiwi.Markdown project. Pending: wireup of login and register views.