improve gitignore
pre-release master merge
vv2014-04-16
v1.0
Merge branch 'develop'
disable colors by default
Improve userdata log
Merge branch 'develop'
Merge branch 'hotfix/ud-1.0r' into develop