Update README.md
Merge branch '0.2'
Fix conflicts
Update README.md
Merge branch '0.3'
Update readme
Merge pull request #3 from MilloLab/0.3

Fix lang strings
Merge pull request #4 from MilloLab/0.3

Added htaccess and fix sql
Merge pull request #5 from MilloLab/0.3

Added BS3 to hello world page and resources paths
Merge pull request #6 from MilloLab/0.3

Clean style.css
Merge branch 'master' into 0.3

Conflicts:
	README.md