Merge branch 'master' of github.com:ingenuitas/SimpleSeer
capturetime_epoch fix
Merge branch 'hotfix/capturetime_epoch-fix'
Merge pull request #361 from oostendo/release/20121016

Release/20121016
Merge branch 'release/20121016'
Merge branch 'master' of github.com:ingenuitas/SimpleSeer
merge
shut up dashbaords
move supervisor into templates
Merge branch 'release/release_20121022'

Conflicts:
	SimpleSeer/paster_templates/seer_project/etc/supervisor.conf
Merge branch 'master' of github.com:ingenuitas/SimpleSeer
Merge branch 'release/release_20121030'
Merge pull request #390 from ingenuitas/develop

Develop
Merge pull request #403 from ingenuitas/develop

Develop
Merge pull request #435 from sightmachine/develop

Develop
Merge pull request #439 from sightmachine/develop

Develop
Merge branch 'master' of github.com:sightmachine/SimpleSeer
Merge branch 'master' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
make camera not just word chars