rc - git merge master added
rc - lns alias
dropbox - sequelpro fixed, messages updated
mergeconflicts - master -> dropbox-rewrite