merge with latest tantalum 10-july
fixed minor issues with merge
updated directory structure. nothing out of hands
Merge branch 'tantalum_master'