Solving merge conflicts#1494
Merged
antgonza merged 16 commits intoqiita-spots:ebi-improvementsfrom Oct 10, 2015
Merged
Commits
Commits on Sep 17, 2015
- committed
- committed
- committed
Commits on Sep 18, 2015
Commits on Sep 28, 2015
Commits on Sep 30, 2015
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Oct 1, 2015
Commits on Oct 9, 2015
Commits on Oct 10, 2015
- committed