Merge tag '20140904' into develop

20140904
Merge branch 'master' into develop
Reformatted code, added bootstrap