merge with master
removing precompiled assets
secret_token