Merge pull request #1 from Jari-Ra/master

Changes
minor changes
grid layout testing
added external js files
some angular tests
Merge pull request #2 from neskola/master

Remember to pull this