branch_lw_20140316 merged with master

Minor changes added to branch_lw_20140316. 
Out of date DB files removed from master branch.