Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
CS log-transport default passwords
Merge branch 'development'
Document(s) to archive
Merge branch 'development'
Merge pull request #5 from jimsky7/master

pull 2014-08-21