erl libs
git proxy
merge with github
save local changes
before merge s1
merge s2
Merge branch 'vlad_at_picon' of caprica:femto/env into vlad_at_picon
fix some merges