Updated version numbers to 2.1.5
Updated build instructions in docs
Added missing file
Removed inappropriate demo
Removed autogenerated makefile
Merge branch 'develop' into release/2.1.5
Merge branch 'release/2.1.5'