dump of live 12-11-14
stashing
Merge branch 'dev'