Merge branch 'develop'

Conflicts: bower.json
wilk · Sep 26, 2014 · 8e615b7 · 8e615b7
2 parents 2854f3d + 65714c5
commit 8e615b7
Show file tree

Hide file tree

Showing 26 changed files with 3,487 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.*~
 demo/
 node_modules/
-.idea/
+.idea/
+build/