Add file locking to save
Update lock-type of save in jenerator
Merge branch 'develop' into flocking_save
Update message
Remove unlock
Swaped include statement in .h and .cpp
Merge pull request #572 from rimms/flocking_save

File locking save (fix #477)