New changes
New changes
Merge branch 'master' of https://github.com/raulmacarie/templates
something
ui modifications
Merge pull request #7 from raulmacarie/mircea

ui modifications
ui changes
Merge pull request #8 from raulmacarie/mircea

ui changes
fixed ui bug
Merge pull request #9 from raulmacarie/mircea

fixed ui bug
ui changes
Merge pull request #10 from raulmacarie/mircea

ui changes
Merge branch 'master' of https://github.com/raulmacarie/templates
ok
Templates panel UI modifications
Color change
Little fix
Merge branch 'master' into mircea

Conflicts:
	js/base.js
Merge branch 'mircea'
new changes
Merge pull request #12 from raulmacarie/mircea

new changes
new modifications