[Design] add asset basic design
Merge branch 'master' of github.com:mdelolmo/squareDA

Conflicts:
	squareDA/src/main/res/layout/fragment_main.xml
Merge branch 'master' of github.com:mdelolmo/squareDA