ANT-14 reformat and rearrange
ANT-15 update bower
Merge branch 'release/0.0.6'