Development

merging development into master, long-term-dev will save login, hashing logic etc. but those features aren't essential and won't be developed until i have time to develop them