get fc compiling
fixed merge conflict
Fixes for windows. Check changes in packing (message.hpp), also some mismatch in std:: toupper signature (name_hash.cpp).
Merge branch 'master' of https://github.com/InvictusInnovations/BitShares
Merge branch 'master' of https://github.com/InvictusInnovations/BitShares
convenience command for generate vcxproj files with cmake