Absolutely forgot about the wscript

In my hurry to publish, I forgot about the wscript required to get the
scenarios to run. This commit adds the missing files.
Small changes to licensing and file descriptions
Created Waypoints by utilizing Bonnmotion for mobile nodes;
Modify ndn-mobility-random.cc to call waypoints files.
Merge branch 'master' of https://github.com/PhilipsIII/ndn-mobility into PhilipsIII-master

Conflicts:
	scenarios/ccn-mobility.cc

Added the new data directories and modified the scenario to include the
NSFile data created by Zhu and Kovi.

Also fixed a merge where the header files conflicted.
Merge branch 'PhilipsIII-master'

This merges all the changes created by Zhu and Kovi, along with changes made to
my personal repository.
Merge remote-tracking branch 'upstream/master'

Changes made by Kovi, Zhu and Miyamoto for the main line.