changed "discard changes" to a more useful "cancel" button

„cancel” will take you back to the last view you were in.
Merge branch 'master' of git://github.com/Froxlor/Froxlor
Updated config templates
Changed id to class
Merge pull request #176 from BNoiZe/master

Various improvements