Fix #1 - use ng-src instead of src for markup values
ninja
merge with modules
ninja without salta
modules css
wide on click
border
fix conflict
Merge branch 'master' into settings