Began merge of friends & main
Merge branch 'master' of github.com:ilw-sdh/ilw2014-app