Merge branch 'master' into 'cards'
# Conflicts: # app/views/partials/head.html # gulpfile.js
app/assets/Icons/X_Icon.png
0 → 100755
225 Bytes
app/assets/Icons/add.svg
0 → 100644
475 Bytes
438 Bytes
app/assets/Icons/country.png
0 → 100755
215 Bytes
app/assets/Icons/culture.png
0 → 100644
549 Bytes
app/assets/Icons/delete.svg
0 → 100644
378 Bytes
247 Bytes
app/assets/Icons/edit.svg
0 → 100644
448 Bytes
app/assets/Icons/family.png
0 → 100755
396 Bytes
app/assets/Icons/grants.png
0 → 100755
446 Bytes
460 Bytes
app/assets/Icons/home.png
0 → 100755
245 Bytes
app/assets/Icons/justice.png
0 → 100644
224 Bytes
547 Bytes
92 Bytes
app/assets/Icons/money.png
0 → 100755
356 Bytes
app/assets/Icons/myData.png
0 → 100755
299 Bytes