changes to trunk
Merge branch 'trunk-2013-10-2'
add .gitignores for empty directories
merging changes