added norm_engine
added norm_engine
Merge pull request #924 from bebopagogo/master

NORM protocol extension
Fixed comment
Merge pull request #925 from hintjens/master

Fixed comment
added uncommitted norm_engine changes
Merge pull request #926 from bebopagogo/master

added uncommitted norm_engine changes
Fix cmake build on windows.
Fix travis build.
Fix travis build.
Fix tabs
fixed another missed norm_engine issue for non-norm build
Merge pull request #927 from ricnewton/master

Fix cmake build on windows & travis build.
Merge pull request #928 from bebopagogo/master

fixed another missed norm_engine issue for non-norm build