Fix code styling for Album
Resolve Conflict for Album and Merge
Moved Biggy Core items to root of Core .csproj
Moved Biggy.Core bits into \src Directory