commiting
c
merged from origin
added information for NIC reference
Merge remote-tracking branch 'origin/laststable' into develop
can now compile from src directory, not just test